[stable33] fix(AppStore/Fetcher): catch GenericFileException when reading cache file in Fetcher#60595
Merged
Merged
Conversation
backportbot
Bot
requested review from
Altahrim,
CarlSchwan,
leftybournes,
miaulalala,
provokateurin,
salmart-dev and
susnux
and removed request for
a team
backportbot
Bot
added
bug
3. to review
CarlSchwan
approved these changes
May 20, 2026
miaulalala
approved these changes
May 20, 2026
…Fetcher When the appstore cache file exists but getContent() throws a GenericFileException (I/O error or OS-level permission failure), explicitly delete the file and recreate it before writing fresh data — mirroring the NotFoundException recovery path. If deletion itself fails, return [] cleanly. Previously, the unhandled exception caused the entire apps settings page to crash. The new test covers both the recovery path and deletion failure. Signed-off-by: Anna Larch <anna@nextcloud.com> AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Attempt delete before logging the warning, so the warning only fires when we know recovery will succeed - Log an error (not silently return) when delete itself fails - Use catch (\Exception) without variable (PHP 8) - Replace willReturnArgument(1) with explicit willReturn(true) in test - Add blank lines between logical blocks in test for readability Signed-off-by: Anna Larch <anna@nextcloud.com> AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
miaulalala
force-pushed
the
backport/60286/stable33
branch
from
aef3ac6 to
b723c94
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #60286